feat: add Claude Code provider for local CLI integration #4864

hannesrudolph · 2025-06-19T02:21:02Z

Description

This PR adds the "Claude Code" provider, adding support for using Claude models through a locally installed command-line tool so users can take advantage of their Claude Code Pro and Max subscriptions within Roo Code

Changes Made

Added new "Claude Code" provider that executes the local claude CLI tool
Implemented streaming support for CLI JSON output parsing
Created configuration UI for setting the CLI tool path
Added all necessary type definitions and model configurations
Included English translations for the new provider
Moved ApiHandlerOptions type to the shared types package for proper module boundaries

Technical Details

New Files

packages/types/src/providers/claude-code.ts - Model definitions for Claude Code
src/api/providers/claude-code.ts - Main handler implementation
src/integrations/claude-code/run.ts - CLI execution logic using execa
src/integrations/claude-code/types.ts - Response type definitions
webview-ui/src/components/settings/providers/ClaudeCode.tsx - Settings UI component

Modified Files

Updated provider settings schemas to include claudeCodePath configuration
Added Claude Code to provider selection UI
Updated localization files with new strings
Refactored type imports to maintain proper module boundaries

Testing

All existing tests pass (2325 tests)
TypeScript compilation successful
No linting errors
Build process completes without errors

How to Use

Install the Claude CLI tool locally
Select "Claude Code" from the API provider dropdown
Configure the path to the claude executable (or leave blank to use PATH)
The provider will execute the CLI tool and stream responses

Notes

This PR ports the "Claude Code" provider from an external pull request (cline/cline PR #4111), adding support for using Claude models through a locally installed command-line tool.

This provider requires users to have the Claude CLI tool installed separately
The CLI tool path can be configured in settings or left blank to use the system PATH
All Claude models supported by the CLI tool are available through this provider

Important

Adds Claude Code provider for local CLI integration, including model definitions, handler implementation, CLI execution logic, and UI configuration.

Behavior:
- Adds "Claude Code" provider for local CLI tool execution.
- Implements streaming support for CLI JSON output parsing.
- Adds configuration UI for CLI tool path.
- Supports all Claude models available via CLI.
Files:
- claude-code.ts: Model definitions.
- claude-code.ts: Main handler implementation.
- run.ts: CLI execution logic using execa.
UI:
- Adds ClaudeCode.tsx for settings UI component.
- Updates provider selection UI and localization files.
Types:
- Moves ApiHandlerOptions to shared types package.

^{This description was created by}^{for c32f71c. You can customize this summary. It will automatically update as commits are pushed.}

Copilot

Pull Request Overview

This PR integrates support for the Claude Code provider via a locally installed CLI tool, extending both the backend API and the settings UI.

Introduces new provider-specific files for handling CLI execution and streaming responses.
Updates UI components and provider settings to include configuration for the Claude Code CLI tool.
Refactors type definitions and API handler resolution to support the new provider.

Reviewed Changes

Copilot reviewed 17 out of 17 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
webview-ui/src/components/settings/providers/index.ts	Exports the new ClaudeCode settings component.
webview-ui/src/components/settings/providers/ClaudeCode.tsx	Adds the UI component for configuring the Claude Code CLI path.
webview-ui/src/components/settings/constants.ts	Updates provider models and provider list to include Claude Code.
webview-ui/src/components/settings/ApiOptions.tsx	Integrates the new Claude Code option in the provider selection UI.
src/shared/api.ts	Refactors ApiHandlerOptions type import for consistency.
src/integrations/claude-code/types.ts	Adds type definitions for messages from the Claude Code CLI integration.
src/integrations/claude-code/run.ts	Implements CLI execution logic for the Claude Code provider.
src/api/transform/stream.ts	Extends stream types to include error chunk handling.
src/api/retry.ts	Incorporates retry logic for API calls with error handling.
src/api/providers/index.ts	Exports the new ClaudeCodeHandler for API provider resolution.
src/api/providers/claude-code.ts	Implements the Claude Code API handler with streaming support.
src/api/index.ts	Updates handler construction to include the Claude Code provider.
packages/types/src/providers/index.ts	Exports new provider types including Claude Code.
packages/types/src/providers/claude-code.ts	Defines type information and default model IDs for Claude Code.
packages/types/src/provider-settings.ts	Extends provider settings schemas to include Claude Code configuration.
packages/types/src/api.ts	Updates ApiHandlerOptions definition for new provider support.

src/api/providers/claude-code.ts

hannesrudolph · 2025-06-19T02:41:13Z

✅ Fixed the knip CI failure by removing the unused src/api/retry.ts file. The CI checks are now running.

webview-ui/src/i18n/locales/zh-CN/settings.json

webview-ui/src/i18n/locales/zh-TW/settings.json

webview-ui/src/i18n/locales/tr/settings.json

webview-ui/src/i18n/locales/vi/settings.json

src/integrations/claude-code/types.ts

daniel-lxs

LGTM

src/api/providers/claude-code.ts

- Use cost_usd from CLI response when available - Fall back to calculating cost based on token usage and model pricing - Ensures consistent cost reporting across all providers

- Only use cost_usd from CLI response when provided - Default to 0 when CLI doesn't provide cost (e.g., subscription users) - Don't calculate cost based on token usage as it may not apply to all users

…tiple languages

src/api/providers/claude-code.ts

- Added processExitedWithError translation key to all supported languages - This replaces concatenated translation calls with a single unified key - Allows for more natural word order in non-English languages - Addresses review feedback from PR #4864

daniel-lxs

Cleaned this up a bit, it had some changes to the types that were unnecessary.

src/integrations/claude-code/run.ts

Co-authored-by: Copilot <[email protected]> Co-authored-by: Daniel <[email protected]> Co-authored-by: Daniel Riccio <[email protected]> Co-authored-by: Matt Rubens <[email protected]>

…4864) Co-authored-by: Copilot <[email protected]> Co-authored-by: Daniel <[email protected]> Co-authored-by: Daniel Riccio <[email protected]> Co-authored-by: Matt Rubens <[email protected]>

Copilot AI review requested due to automatic review settings June 19, 2025 02:21

hannesrudolph requested review from cte, jr and mrubens as code owners June 19, 2025 02:21

github-project-automation bot added this to Roo Code Roadmap and Roo Code Roadmap Jun 19, 2025

github-project-automation bot moved this to Triage in Roo Code Roadmap Jun 19, 2025

github-project-automation bot moved this to New in Roo Code Roadmap Jun 19, 2025

dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. enhancement New feature or request labels Jun 19, 2025

Copilot AI reviewed Jun 19, 2025

View reviewed changes

src/api/providers/claude-code.ts Outdated Show resolved Hide resolved

ellipsis-dev bot reviewed Jun 19, 2025

View reviewed changes

src/api/providers/claude-code.ts Outdated Show resolved Hide resolved

hannesrudolph added the Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. label Jun 19, 2025

ellipsis-dev bot reviewed Jun 19, 2025

View reviewed changes

webview-ui/src/i18n/locales/zh-CN/settings.json Show resolved Hide resolved

webview-ui/src/i18n/locales/zh-TW/settings.json Show resolved Hide resolved

webview-ui/src/i18n/locales/tr/settings.json Show resolved Hide resolved

webview-ui/src/i18n/locales/vi/settings.json Show resolved Hide resolved

daniel-lxs moved this from Triage to PR [Needs Prelim Review] in Roo Code Roadmap Jun 19, 2025

hannesrudolph added PR - Needs Preliminary Review and removed Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. labels Jun 19, 2025

daniel-lxs reviewed Jun 20, 2025

View reviewed changes

src/integrations/claude-code/types.ts Outdated Show resolved Hide resolved

daniel-lxs approved these changes Jun 20, 2025

View reviewed changes

dosubot bot added the lgtm This PR has been approved by a maintainer label Jun 20, 2025

daniel-lxs moved this from PR [Needs Prelim Review] to PR [Needs Review] in Roo Code Roadmap Jun 20, 2025

hannesrudolph added PR - Needs Review and removed PR - Needs Preliminary Review labels Jun 20, 2025

mrubens reviewed Jun 20, 2025

View reviewed changes

src/api/providers/claude-code.ts Outdated Show resolved Hide resolved

daniel-lxs moved this from PR [Needs Review] to PR [Changes Requested] in Roo Code Roadmap Jun 20, 2025

hannesrudolph and others added 8 commits June 20, 2025 18:03

fix: remove unused retry.ts file to resolve knip CI failure

ff85ebc

fix: calculate cost for Claude Code provider when CLI doesn't provide it

0e2306b

- Use cost_usd from CLI response when available - Fall back to calculating cost based on token usage and model pricing - Ensures consistent cost reporting across all providers

fix: revert cost calculation for Claude Code provider

1020c62

- Only use cost_usd from CLI response when provided - Default to 0 when CLI doesn't provide cost (e.g., subscription users) - Don't calculate cost based on token usage as it may not apply to all users

fix(i18n): correct claude code provider translations

a8711a4

fix(i18n): add simplified chinese translations for claude code

c6b226c

fix(i18n): translate claude code provider settings

b0ab355

Update src/integrations/claude-code/types.ts

c437053

fix(i18n): add error messages for Claude Code process handling in mul…

7dd9357

…tiple languages

daniel-lxs force-pushed the feat/claude-code-provider branch from 5770341 to 7dd9357 Compare June 20, 2025 23:14

ellipsis-dev bot reviewed Jun 20, 2025

View reviewed changes

src/api/providers/claude-code.ts Outdated Show resolved Hide resolved

daniel-lxs moved this from PR [Changes Requested] to PR [Needs Review] in Roo Code Roadmap Jun 22, 2025

hannesrudolph added PR - Needs Review and removed PR - Changes Requested labels Jun 22, 2025

daniel-lxs added 4 commits June 22, 2025 10:22

fix(api): remove redundant ApiHandlerOptions import in ClaudeCodeHandler

4ae2982

revert this

a5d2f95

revert this

c32f71c

daniel-lxs approved these changes Jun 22, 2025

View reviewed changes

mrubens reviewed Jun 23, 2025

View reviewed changes

src/integrations/claude-code/run.ts Outdated Show resolved Hide resolved

mrubens approved these changes Jun 23, 2025

View reviewed changes

Update src/integrations/claude-code/run.ts

94b553b

mrubens merged commit ff9b6b3 into main Jun 23, 2025
7 checks passed

mrubens deleted the feat/claude-code-provider branch June 23, 2025 03:17

github-project-automation bot moved this from New to Done in Roo Code Roadmap Jun 23, 2025

github-project-automation bot moved this from PR [Needs Review] to Done in Roo Code Roadmap Jun 23, 2025

sahksas mentioned this pull request Jun 26, 2025

integrate claude code #4846

Closed

23 tasks

secondsky mentioned this pull request Jul 26, 2025

How to use with Claude Code Subscription? superdesigndev/superdesign#27

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: add Claude Code provider for local CLI integration #4864

feat: add Claude Code provider for local CLI integration #4864

Uh oh!

hannesrudolph commented Jun 19, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

hannesrudolph commented Jun 19, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

daniel-lxs left a comment

Uh oh!

Uh oh!

Uh oh!

daniel-lxs left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

feat: add Claude Code provider for local CLI integration #4864

feat: add Claude Code provider for local CLI integration #4864

Uh oh!

Conversation

hannesrudolph commented Jun 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Changes Made

Technical Details

New Files

Modified Files

Testing

How to Use

Notes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

hannesrudolph commented Jun 19, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

daniel-lxs left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

daniel-lxs left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

hannesrudolph commented Jun 19, 2025 •

edited

Loading